66. Araxis Merge File Comparison Report

Produced by Araxis Merge on Fri Dec 13 16:40:55 2019 UTC. See www.araxis.com for information about Merge. This report uses XHTML and CSS2, and is best viewed with a reasonably standards compliant browser such as the latest version of Firefox or Internet Explorer. For optimum results when printing this report, use landscape orientation and enable printing of background images and colours in your browser.

66.1 Files compared

# Location File Last Modified
1 Porto v.3.2.1\Theme Files\Magento 1.x\Porto Theme\app\design\frontend\smartwave\porto\template\page\html head.phtml Sun Dec 10 15:42:00 2017 UTC
2 Porto v.3.2.2\Theme Files\Magento 1.x\Porto Theme\app\design\frontend\smartwave\porto\template\page\html head.phtml Thu Nov 28 15:06:10 2019 UTC

66.2 Comparison summary

Description Between
Files 1 and 2
Text Blocks Lines
Unchanged 2 96
Changed 1 4
Inserted 0 0
Removed 0 0

66.3 Comparison options

Whitespace All differences in whitespace within lines are ignored
Character case Differences in character case are significant
Line endings Differences in line endings (CR and LF characters) are ignored
CR/LF characters Not shown in the comparison detail

66.4 Active regular expressions

No regular expressions were active.

66.5 Comparison detail

1   <meta http -equiv="Co ntent-Type " content= "<?php ech o $this->g etContentT ype() ?>"  />   1   <meta http -equiv="Co ntent-Type " content= "<?php ech o $this->g etContentT ype() ?>"  />
2   <?php if($ meta_title =$this->ge tMetaTitle ()): ?>   2   <?php if($ meta_title =$this->ge tMetaTitle ()): ?>
3   <title><?p hp echo ht mlspecialc hars($meta _title) ?> </title>   3   <title><?p hp echo ht mlspecialc hars($meta _title) ?> </title>
4   <?php else : ?>   4   <?php else : ?>
5   <title><?p hp echo $t his->getTi tle() ?></ title>   5   <title><?p hp echo $t his->getTi tle() ?></ title>
6   <?php endi f; ?>   6   <?php endi f; ?>
7   <meta name ="descript ion" conte nt="<?php  echo htmls pecialchar s($this->g etDescript ion()) ?>"  />   7   <meta name ="descript ion" conte nt="<?php  echo htmls pecialchar s($this->g etDescript ion()) ?>"  />
8   <meta name ="keywords " content= "<?php ech o htmlspec ialchars($ this->getK eywords())  ?>" />   8   <meta name ="keywords " content= "<?php ech o htmlspec ialchars($ this->getK eywords())  ?>" />
9   <meta name ="robots"  content="< ?php echo  htmlspecia lchars($th is->getRob ots()) ?>"  />   9   <meta name ="robots"  content="< ?php echo  htmlspecia lchars($th is->getRob ots()) ?>"  />
10   <?php   10   <?php
11       $theme  = Mage::h elper('por to');   11       $theme  = Mage::h elper('por to');
12       $charS ubset = '& subset=lat in';   12       $charS ubset = '& subset=lat in';
13       $d = $ theme->get CfgSection Design();   13       $d = $ theme->get CfgSection Design();
14       $s = $ theme->get CfgSection Settings() ;   14       $s = $ theme->get CfgSection Settings() ;
15           if (!isset($s ['general' ]['disable _responsiv e']) || (i sset($s['g eneral'][' disable_re sponsive'] ) && !$s[' general'][ 'disable_r esponsive' ])){   15           if (!isset($s ['general' ]['disable _responsiv e']) || (i sset($s['g eneral'][' disable_re sponsive'] ) && !$s[' general'][ 'disable_r esponsive' ])){
16   ?>         16   ?>      
17   <meta name ="viewport " content= "width=dev ice-width,  initial-s cale=1.0"/ >   17   <meta name ="viewport " content= "width=dev ice-width,  initial-s cale=1.0"/ >
18   <?php   18   <?php
19           }   19           }
20   ?>   20   ?>
21   <link rel= "icon" hre f="<?php e cho $this- >getFavico nFile(); ? >" type="i mage/x-ico n" />   21   <link rel= "icon" hre f="<?php e cho $this- >getFavico nFile(); ? >" type="i mage/x-ico n" />
22   <link rel= "shortcut  icon" href ="<?php ec ho $this-> getFavicon File(); ?> " type="im age/x-icon " />   22   <link rel= "shortcut  icon" href ="<?php ec ho $this-> getFavicon File(); ?> " type="im age/x-icon " />
23     23  
24   <?php //In clude Goog le fonts c haracter s ubsets (su ch as exte nded latin , cyrillic )   24   <?php //In clude Goog le fonts c haracter s ubsets (su ch as exte nded latin , cyrillic )
25       if (is set($d['fo nt']['prim ary_char_l atin_ext'] ) && $d['f ont']['pri mary_char_ latin_ext' ]==1 )   25       if (is set($d['fo nt']['prim ary_char_l atin_ext'] ) && $d['f ont']['pri mary_char_ latin_ext' ]==1 )
26           $c harSubset  .= ',latin -ext';   26           $c harSubset  .= ',latin -ext';
27       if (is set($d['fo nt']['cust om_char_su bset']) &&  $d['font' ]['custom_ char_subse t'])   27       if (is set($d['fo nt']['cust om_char_su bset']) &&  $d['font' ]['custom_ char_subse t'])
28           $c harSubset  .= ','.$d[ 'font']['c ustom_char _subset'];   28           $c harSubset  .= ','.$d[ 'font']['c ustom_char _subset'];
29       $font_ sizes = "% 3A300%2C30 0italic%2C 400%2C400i talic%2C60 0%2C600ita lic%2C700% 2C700itali c%2C800%2C 800italic" ;   29       $font_ sizes = "% 3A300%2C30 0italic%2C 400%2C400i talic%2C60 0%2C600ita lic%2C700% 2C700itali c%2C800%2C 800italic" ;
30   ?>   30   ?>
31   <?php if ( $d['font'] ['custom']  && $d['fo nt']['prim ary_font_f amily_grou p'] == 'go ogle'): ?>   31   <?php if ( $d['font'] ['custom']  && $d['fo nt']['prim ary_font_f amily_grou p'] == 'go ogle'): ?>
32   <link rel= "styleshee t" href='/ /fonts.goo gleapis.co m/css?fami ly=<?php e cho str_re place(' ',  '+', $d[' font']['pr imary_font _family']) .$font_siz es; echo $ charSubset ; ?>' type ='text/css ' />   32   <link rel= "styleshee t" href='/ /fonts.goo gleapis.co m/css?fami ly=<?php e cho str_re place(' ',  '+', $d[' font']['pr imary_font _family']) .$font_siz es; echo $ charSubset ; ?>' type ='text/css ' />
33   <?php else : ?>   33   <?php else : ?>
34   <link rel= "styleshee t" href="/ /fonts.goo gleapis.co m/css?fami ly=Open+Sa ns%3A300%2 C300italic %2C400%2C4 00italic%2 C600%2C600 italic%2C7 00%2C700it alic%2C800 %2C800ital ic&amp;v1& amp;subset =latin%2Cl atin-ext"  type="text /css" medi a="screen" />   34   <link rel= "styleshee t" href="/ /fonts.goo gleapis.co m/css?fami ly=Open+Sa ns%3A300%2 C300italic %2C400%2C4 00italic%2 C600%2C600 italic%2C7 00%2C700it alic%2C800 %2C800ital ic&amp;v1& amp;subset =latin%2Cl atin-ext"  type="text /css" medi a="screen" />
35   <?php endi f;?>   35   <?php endi f;?>
36   <link href ='//fonts. googleapis .com/css?f amily=Shad ows+Into+L ight' rel= 'styleshee t' type='t ext/css'/>   36   <link   href="
//fonts.go ogleapis.c om/css?fam ily= Shadows+In to+Light|O swald:300, 400,700| Poppins:30 0,400,500, 600,700 |Open+Sans %3A300%2C3 00italic%2 C400%2C400 italic%2C6 00%2C600it alic%2C700 %2C700ital ic%2C800%2 C800italic "   rel="style sheet">
37   <link href ="https:// fonts.goog leapis.com /css?famil y=Oswald:3 00,400,700 " rel="sty lesheet">        
38   <link   href=" https: //fonts.go ogleapis.c om/css?fam ily=
Poppins:30 0,400,500, 600,700
"   rel="style sheet">
       
39   <?php echo  $this->ge tCssJsHtml () ?>   37   <?php echo  $this->ge tCssJsHtml () ?>
40   <?php echo  $this->ge tChildHtml () ?>   38   <?php echo  $this->ge tChildHtml () ?>
41   <?php echo  $this->he lper('core /js')->get Translator Script() ? >   39   <?php echo  $this->he lper('core /js')->get Translator Script() ? >
42   <?php echo  $this->ge tIncludes( ) ?>   40   <?php echo  $this->ge tIncludes( ) ?>
43   <script ty pe="text/j avascript" >   41   <script ty pe="text/j avascript" >
44   //<![CDATA [   42   //<![CDATA [
45   if (typeof  dailydeal TimeCounte rsCategory  == 'undef ined') {   43   if (typeof  dailydeal TimeCounte rsCategory  == 'undef ined') {
46           va r dailydea lTimeCount ersCategor y = new Ar ray();   44           va r dailydea lTimeCount ersCategor y = new Ar ray();
47           va r i = 0;   45           va r i = 0;
48   }   46   }
49   //]]>   47   //]]>
50   </script>   48   </script>
51   <!--<?php  echo "Port o Magento  Theme: v". Mage::getC onfig()->g etModuleCo nfig("Smar twave_Port o")->versi on; ?>-->   49   <!--<?php  echo "Port o Magento  Theme: v". Mage::getC onfig()->g etModuleCo nfig("Smar twave_Port o")->versi on; ?>-->